From: Ingo Molnar Date: Wed, 27 Apr 2011 08:38:30 +0000 (+0200) Subject: Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~14114^2~18 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/?a=commitdiff_plain;h=32673822e440eb92eb334631eb0a199d0c532d13;p=linux-4.9.git Merge branch 'tip/perf/core' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into perf/core Conflicts: include/linux/perf_event.h Merge reason: pick up the latest jump-label enhancements, they are cooked ready. Signed-off-by: Ingo Molnar --- 32673822e440eb92eb334631eb0a199d0c532d13